Merge.

Signed-off-by: Steven Smith, sos22@cam.ac.uk

diff --cc tools/libxc/xc_linux_build.c
index ac0c734aabcc579bb6927f318aaf4840ada61de9,11bd3fbc5a62491293170320b9ddbd1c16e4d83a..3c80b5e994a8027afbc6b5183a9faf3e23728635
--- 1/tools/libxc/xc_linux_build.c
--- 2/tools/libxc/xc_linux_build.c
+++ b/tools/libxc/xc_linux_build.c
@@@ -250,12 -241,9 +250,12 @@@ static int setup_pg_tables_64(int xc_ha
  
      /* First allocate page for page dir. */
      ppt_alloc = (vpt_start - dsi_v_start) >> PAGE_SHIFT;
-     alloc_pt(l4tab, vl4tab);
+     alloc_pt(l4tab, vl4tab, pl4tab);
      vl4e = &vl4tab[l4_table_offset(dsi_v_start)];
 -    ctxt->ctrlreg[3] = l4tab;
 +    if (shadow_mode_enabled)
 +        ctxt->ctrlreg[3] = pl4tab;
 +    else
 +        ctxt->ctrlreg[3] = l4tab;
      
      for ( count = 0; count < ((v_end-dsi_v_start)>>PAGE_SHIFT); count++)
      {

diff --cc xen/arch/x86/mm.c
Simple merge